From: Glenn Morris <rgm@gnu.org>
Date: Thu, 19 Sep 2013 02:55:00 +0000 (-0700)
Subject: * eshell/esh-proc.el (eshell-reset-after-proc): Mark unused arg.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3112
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=390b7f9de6215917c6cf08e30ca898562d2517e3;p=emacs.git

* eshell/esh-proc.el (eshell-reset-after-proc): Mark unused arg.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5384713cb40..e2173ef57cc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -14,7 +14,8 @@
 
 	* eshell/em-smart.el (eshell-smart-scroll-window)
 	(eshell-disable-after-change):
-	* eshell/em-term.el (eshell-term-sentinel): Mark unused arg.
+	* eshell/em-term.el (eshell-term-sentinel):
+	* eshell/esh-proc.el (eshell-reset-after-proc): Mark unused arg.
 
 2013-09-18  Alan Mackenzie  <acm@muc.de>
 
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index e77287c2f78..b72e6328d64 100644
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -133,7 +133,11 @@ PROC and STATUS to both."
 ; (define-key eshell-command-map [(control ?z)]  'eshell-stop-process)
   (define-key eshell-command-map [(control ?\\)] 'eshell-quit-process))
 
-(defun eshell-reset-after-proc (proc status)
+;; This used to be on `eshell-kill-hook', which calls its functions
+;; with two arguments.  Nowadays we call it directly in
+;; `eshell-kill-process-function', but in case anyone still has it
+;; on `eshell-kill-hook', _proc has to stay.
+(defun eshell-reset-after-proc (_proc status)
   "Reset the command input location after a process terminates.
 The signals which will cause this to happen are matched by
 `eshell-reset-signals'."